From e642909823971f4f1ae6cbbdda83770b7994ac94 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 25 Oct 2016 15:56:52 -0400 Subject: [PATCH] Remove deprecated display ungrab functions --- docs/reference/gdk/gdk4-sections.txt | 2 - gdk/gdkdisplay.c | 68 ---------------------------- gdk/gdkdisplay.h | 9 ---- 3 files changed, 79 deletions(-) diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index c098ce8da5..151b46f476 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -102,8 +102,6 @@ gdk_display_get_default gdk_display_get_name gdk_display_get_default_screen gdk_display_get_device_manager -gdk_display_pointer_ungrab -gdk_display_keyboard_ungrab gdk_display_device_is_grabbed gdk_display_beep gdk_display_sync diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 625804b6dd..df073b6f8c 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -507,74 +507,6 @@ gdk_display_put_event (GdkDisplay *display, gdk_display_put_event_nocopy (display, gdk_event_copy (event)); } -/** - * gdk_display_pointer_ungrab: - * @display: a #GdkDisplay. - * @time_: a timestap (e.g. %GDK_CURRENT_TIME). - * - * Release any pointer grab. - * - * Since: 2.2 - * - * Deprecated: 3.0: Use gdk_device_ungrab(), together with gdk_device_grab() - * instead. - */ -void -gdk_display_pointer_ungrab (GdkDisplay *display, - guint32 time_) -{ - GList *seats, *s; - GdkDevice *device; - - g_return_if_fail (GDK_IS_DISPLAY (display)); - - seats = gdk_display_list_seats (display); - - for (s = seats; s; s = s->next) - { - device = gdk_seat_get_pointer (s->data); - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - gdk_device_ungrab (device, time_); - G_GNUC_END_IGNORE_DEPRECATIONS; - } - - g_list_free (seats); -} - -/** - * gdk_display_keyboard_ungrab: - * @display: a #GdkDisplay. - * @time_: a timestap (e.g #GDK_CURRENT_TIME). - * - * Release any keyboard grab - * - * Since: 2.2 - * - * Deprecated: 3.0: Use gdk_device_ungrab(), together with gdk_device_grab() - * instead. - */ -void -gdk_display_keyboard_ungrab (GdkDisplay *display, - guint32 time) -{ - GList *seats, *s; - GdkDevice *device; - - g_return_if_fail (GDK_IS_DISPLAY (display)); - - seats = gdk_display_list_seats (display); - - for (s = seats; s; s = s->next) - { - device = gdk_seat_get_keyboard (s->data); - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - gdk_device_ungrab (device, time); - G_GNUC_END_IGNORE_DEPRECATIONS; - } - - g_list_free (seats); -} - /** * gdk_beep: * diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h index 4a7ca18681..24c582e0d6 100644 --- a/gdk/gdkdisplay.h +++ b/gdk/gdkdisplay.h @@ -53,15 +53,6 @@ const gchar * gdk_display_get_name (GdkDisplay *display); GDK_AVAILABLE_IN_ALL GdkScreen * gdk_display_get_default_screen (GdkDisplay *display); -#ifndef GDK_MULTIDEVICE_SAFE -GDK_DEPRECATED_IN_3_0_FOR(gdk_device_ungrab) -void gdk_display_pointer_ungrab (GdkDisplay *display, - guint32 time_); -GDK_DEPRECATED_IN_3_0_FOR(gdk_device_ungrab) -void gdk_display_keyboard_ungrab (GdkDisplay *display, - guint32 time_); -#endif /* GDK_MULTIDEVICE_SAFE */ - GDK_AVAILABLE_IN_ALL gboolean gdk_display_device_is_grabbed (GdkDisplay *display, GdkDevice *device); -- 2.30.2